From ddbd3268fa13026e808b887a299ef18d783ea84c Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 3 Dec 2000 21:41:06 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc3eb9e796b..8ba2b500516 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2000-12-03  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* emacs-lisp/easy-mmode.el (define-derived-mode) 
+	(easy-mmode-derived-mode-p): Remove (moved to derived.el).
+
+	* derived.el (define-derived-mode): Revived, moved from easy-mmode.el.
+	(derived-mode-p): New function.
+	(derived-mode-make-docstring): Add `docstring' argument.
+	Use it if available and complete it if necessary.
+
 2000-12-03  Andreas Schwab  <schwab@suse.de>
 
 	* type-break.el (type-break): Don't make parent of itself.
-- 
2.30.2